From 201bb5ec228014b3779cb07cae2144a84a05d158 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Fri, 22 Aug 2008 20:28:29 +0000 Subject: [PATCH] smplrout: Carsten adds option 'relative'. --- reference/track/simplify-relative.gpx | 614 +++++++++++++++++++++++++ reference/track/simplify-relative2.gpx | 212 +++++++++ testo | 8 +- 3 files changed, 833 insertions(+), 1 deletion(-) create mode 100644 reference/track/simplify-relative.gpx create mode 100644 reference/track/simplify-relative2.gpx diff --git a/reference/track/simplify-relative.gpx b/reference/track/simplify-relative.gpx new file mode 100644 index 000000000..d9ac68c57 --- /dev/null +++ b/reference/track/simplify-relative.gpx @@ -0,0 +1,614 @@ + + + + + + + + 328.000000 + + 7 + 5.300000 + + + 325.000000 + + 8 + 5.300000 + + + 325.000000 + + 8 + 1.020000 + + + 323.000000 + + 7 + 2.260000 + + + 322.000000 + + 7 + 3.090000 + + + 321.000000 + + 7 + 3.090000 + + + 321.000000 + + 6 + 1.290000 + + + 320.000000 + + 7 + 3.090000 + + + 316.000000 + + 7 + 1.290000 + + + 313.000000 + + 6 + 4.090000 + + + 312.000000 + + 6 + 1.580000 + + + 312.000000 + + 6 + 2.660000 + + + 312.000000 + + 7 + 1.020000 + + + 317.000000 + + 6 + 2.660000 + + + 319.000000 + + 8 + 2.260000 + + + 320.000000 + + 7 + 1.290000 + + + 316.000000 + + 7 + 1.580000 + + + 310.000000 + + 6 + 1.290000 + + + 308.000000 + + 6 + 1.290000 + + + 306.000000 + + 5 + 1.290000 + + + 305.000000 + + 7 + 3.090000 + + + 305.000000 + + 6 + 2.260000 + + + 305.000000 + + 7 + 2.660000 + + + 318.000000 + + 7 + 5.300000 + + + 319.000000 + + 7 + 3.090000 + + + 321.000000 + + 7 + 1.910000 + + + 323.000000 + + 6 + 1.910000 + + + 322.000000 + + 6 + 1.580000 + + + 321.000000 + + 5 + 1.020000 + + + 319.000000 + + 6 + 1.580000 + + + 318.000000 + + 6 + 1.580000 + + + 318.000000 + + 6 + 3.560000 + + + 318.000000 + + 6 + 1.020000 + + + 314.000000 + + 6 + 2.260000 + + + 314.000000 + + 6 + 2.660000 + + + 317.000000 + + 6 + 1.020000 + + + 317.000000 + + 6 + 1.290000 + + + 318.000000 + + 5 + 1.290000 + + + 315.000000 + + 6 + 3.090000 + + + 314.000000 + + 7 + 1.290000 + + + 314.000000 + + 9 + 2.260000 + + + 320.000000 + + 8 + 1.580000 + + + 320.000000 + + 7 + 4.660000 + + + 318.000000 + + 6 + 1.290000 + + + 319.000000 + + 5 + 1.910000 + + + 316.000000 + + 7 + 1.290000 + + + 312.000000 + + 6 + 2.260000 + + + 313.000000 + + 7 + 4.660000 + + + 318.000000 + + 5 + 5.990000 + + + 320.000000 + + 4 + 2.260000 + + + 319.000000 + + 6 + 4.660000 + + + 318.000000 + + 7 + 1.580000 + + + 315.000000 + + 9 + 2.260000 + + + 312.000000 + + 9 + 1.580000 + + + 313.000000 + + 9 + 2.260000 + + + 314.000000 + + 7 + 2.260000 + + + 314.000000 + + 7 + 2.260000 + + + 303.000000 + + 6 + 2.660000 + + + 302.000000 + + 7 + 1.020000 + + + 302.000000 + + 6 + 1.020000 + + + 304.000000 + + 5 + 1.910000 + + + 305.000000 + + 5 + 6.760000 + + + 309.000000 + + 6 + 2.660000 + + + 309.000000 + + 5 + 9.550000 + + + 310.000000 + + 6 + 4.090000 + + + 311.000000 + + 7 + 5.990000 + + + 311.000000 + + 8 + 1.910000 + + + 312.000000 + + 9 + 7.600000 + + + 314.000000 + + 9 + 3.090000 + + + 314.000000 + + 9 + 4.090000 + + + 314.000000 + + 8 + 1.910000 + + + 315.000000 + + 9 + 1.910000 + + + 316.000000 + + 9 + 1.910000 + + + 320.000000 + + 8 + 1.580000 + + + 326.000000 + + 8 + 4.090000 + + + 334.000000 + + 9 + 4.090000 + + + 331.000000 + + 8 + 4.660000 + + + 331.000000 + + 8 + 1.910000 + + + 330.000000 + + 8 + 3.560000 + + + 322.000000 + + 7 + 1.290000 + + + 315.000000 + + 7 + 1.910000 + + + 311.000000 + + 7 + 2.260000 + + + 312.000000 + + 7 + 1.290000 + + + 313.000000 + + 6 + 1.290000 + + + 313.000000 + + 7 + 2.260000 + + + 315.000000 + + 7 + 3.090000 + + + 314.000000 + + 9 + 1.290000 + + + 314.000000 + + 9 + 3.090000 + + + 316.000000 + + 5 + 2.260000 + + + 316.000000 + + 5 + 1.910000 + + + 316.000000 + + 7 + 2.260000 + + + 316.000000 + + 6 + 1.910000 + + + 314.000000 + + 6 + 1.910000 + + + 314.000000 + + 6 + 3.090000 + + + 313.000000 + + 8 + 3.560000 + + + 312.000000 + + 7 + 6.760000 + + + 311.000000 + + 7 + 3.560000 + + + 314.000000 + + 6 + 3.090000 + + + 314.000000 + + 7 + 1.580000 + + + 312.000000 + + 7 + 3.560000 + + + + diff --git a/reference/track/simplify-relative2.gpx b/reference/track/simplify-relative2.gpx new file mode 100644 index 000000000..9938128e9 --- /dev/null +++ b/reference/track/simplify-relative2.gpx @@ -0,0 +1,212 @@ + + + + + + + + 328.000000 + + 7 + 5.300000 + + + 325.000000 + + 8 + 1.020000 + + + 312.000000 + + 7 + 1.020000 + + + 319.000000 + + 8 + 2.260000 + + + 320.000000 + + 7 + 1.290000 + + + 316.000000 + + 7 + 1.580000 + + + 308.000000 + + 6 + 1.290000 + + + 306.000000 + + 5 + 1.290000 + + + 305.000000 + + 7 + 2.660000 + + + 321.000000 + + 7 + 1.910000 + + + 321.000000 + + 5 + 1.020000 + + + 318.000000 + + 6 + 1.020000 + + + 314.000000 + + 6 + 2.660000 + + + 314.000000 + + 9 + 2.260000 + + + 318.000000 + + 6 + 1.290000 + + + 312.000000 + + 6 + 2.260000 + + + 320.000000 + + 4 + 2.260000 + + + 318.000000 + + 7 + 1.580000 + + + 315.000000 + + 9 + 2.260000 + + + 314.000000 + + 7 + 2.260000 + + + 302.000000 + + 7 + 1.020000 + + + 302.000000 + + 6 + 1.020000 + + + 304.000000 + + 5 + 1.910000 + + + 311.000000 + + 8 + 1.910000 + + + 315.000000 + + 9 + 1.910000 + + + 326.000000 + + 8 + 4.090000 + + + 331.000000 + + 8 + 1.910000 + + + 315.000000 + + 7 + 1.910000 + + + 312.000000 + + 7 + 1.290000 + + + 314.000000 + + 9 + 1.290000 + + + 314.000000 + + 6 + 1.910000 + + + 314.000000 + + 6 + 3.090000 + + + 312.000000 + + 7 + 3.560000 + + + + diff --git a/testo b/testo index e8fba4a65..928cbda98 100755 --- a/testo +++ b/testo @@ -19,7 +19,7 @@ fi TMPDIR=${GBTEMP:-/tmp}/gpsbabel.$$ mkdir -p $TMPDIR -# trap "rm -fr $TMPDIR" 0 1 2 3 15 +trap "rm -fr $TMPDIR" 0 1 2 3 15 bincompare() { @@ -1414,5 +1414,11 @@ ${PNAME} -i gnav_trl -f ${REFERENCE}/track/gnav_trl.trl -o gnav_trl -F ${TMPDIR} ${PNAME} -i gnav_trl -f ${TMPDIR}/gnav_trl.trl -t -o unicsv,utc=0 -F ${TMPDIR}/gnav_trl~trl2.csv compare ${REFERENCE}/track/gnav_trl~trl.csv ${TMPDIR}/gnav_trl~trl2.csv +# +# simplify, option 'relative' +# +${PNAME} -i gpx -f ${REFERENCE}/track/simplify-relative.gpx -x simplify,relative,count=33 -o gpx -F ${TMPDIR}/simplify-relative2.gpx +compare ${REFERENCE}/track/simplify-relative2.gpx ${TMPDIR}/simplify-relative2.gpx + exit 0 -- 2.30.2